From 4ab431ac50ebefac978a5fea59be602a173ac874 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild2.aw" Date: Tue, 2 Jan 2007 15:19:44 -0700 Subject: [PATCH] [IA64] vcpu_get_psr fix mov r1=psr only return PSR{36:35,31:0} Signed-off-by: Anthony Xu --- xen/arch/ia64/xen/vcpu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c index 6c3861a3a9..da609c8a8e 100644 --- a/xen/arch/ia64/xen/vcpu.c +++ b/xen/arch/ia64/xen/vcpu.c @@ -450,8 +450,6 @@ IA64FAULT vcpu_get_psr(VCPU * vcpu, u64 * pval) struct ia64_psr newpsr; newpsr = *(struct ia64_psr *)®s->cr_ipsr; - if (newpsr.cpl == 2) - newpsr.cpl = 0; if (!vcpu->vcpu_info->evtchn_upcall_mask) newpsr.i = 1; else @@ -469,6 +467,7 @@ IA64FAULT vcpu_get_psr(VCPU * vcpu, u64 * pval) else newpsr.pp = 0; *pval = *(unsigned long *)&newpsr; + *pval &= (MASK(0, 32) | MASK(35, 2)); return IA64_NO_FAULT; } -- 2.30.2